From: Sandrine Bailleux <sandrine.bailleux@arm.com>
Date: Wed, 24 Jun 2015 14:26:39 +0000 (+0100)
Subject: Bug fix: Build time condition to relocate RW data
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=c9915c0b0ff563ca5dedc1a303777b9644ae7f59;p=project%2Fbcm63xx%2Fatf.git

Bug fix: Build time condition to relocate RW data

This patch fixes the build time condition deciding whether the
read-write data should be relocated from ROM to RAM. It was incorrectly
using __DATA_ROM_START__, which is a linker symbol and not a compiler
build flag. As a result, the relocation code was always compiled out.

This bug has been introduced by the following patch:
"Rationalize reset handling code"

Change-Id: I1c8d49de32f791551ab4ac832bd45101d6934045
---

diff --git a/include/common/el3_common_macros.S b/include/common/el3_common_macros.S
index b8a947cf..eb033a6e 100644
--- a/include/common/el3_common_macros.S
+++ b/include/common/el3_common_macros.S
@@ -226,7 +226,7 @@
 		bl	zeromem16
 #endif
 
-#ifdef __DATA_ROM_START__
+#if IMAGE_BL1
 		ldr	x0, =__DATA_RAM_START__
 		ldr	x1, =__DATA_ROM_START__
 		ldr	x2, =__DATA_SIZE__